Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cse: catch up master #810

Merged
merged 14 commits into from
May 22, 2023

Conversation

iosmanthus
Copy link
Member

Signed-off-by: iosmanthus [email protected]

MyonKeminta and others added 14 commits April 26, 2023 15:50
Signed-off-by: MyonKeminta <[email protected]>
Co-authored-by: MyonKeminta <[email protected]>
Signed-off-by: Smityz <[email protected]>
Co-authored-by: disksing <[email protected]>
* fix wrong resource group name

Signed-off-by: Connor1996 <[email protected]>
* support verifying primary for check_txn_status

Signed-off-by: MyonKeminta <[email protected]>

* update kvproto

Signed-off-by: MyonKeminta <[email protected]>

* add more failpoint usages

Signed-off-by: MyonKeminta <[email protected]>

* update depencency and fix test

Signed-off-by: MyonKeminta <[email protected]>

* Do not skip for unistore; refine logs

Signed-off-by: MyonKeminta <[email protected]>

* Address comments

Signed-off-by: MyonKeminta <[email protected]>

---------

Signed-off-by: MyonKeminta <[email protected]>
Co-authored-by: MyonKeminta <[email protected]>
* lock_resolver: handle pessimistic locks in BatchResolveLocks

Signed-off-by: MyonKeminta <[email protected]>

* Add test but failed on unistore because unistore's ScanLock doesnt return lock type

Signed-off-by: MyonKeminta <[email protected]>

* Address comments

Signed-off-by: MyonKeminta <[email protected]>

* Fix test

Signed-off-by: zyguan <[email protected]>

* Fix golangci

Signed-off-by: zyguan <[email protected]>

---------

Signed-off-by: MyonKeminta <[email protected]>
Signed-off-by: zyguan <[email protected]>
Co-authored-by: MyonKeminta <[email protected]>
… error (tikv#796)

* handle flashback error when follower read

Signed-off-by: you06 <[email protected]>

* add test

Signed-off-by: you06 <[email protected]>

* trigger CI

Signed-off-by: you06 <[email protected]>

* fix panic

Signed-off-by: you06 <[email protected]>

* trigger CI

Signed-off-by: you06 <[email protected]>

* trigger CI

Signed-off-by: you06 <[email protected]>

---------

Signed-off-by: you06 <[email protected]>
@iosmanthus iosmanthus merged commit 5f10ed1 into tikv:cse-region-client May 22, 2023
@iosmanthus iosmanthus deleted the cse/catch-up-master-0 branch May 22, 2023 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants